Change-Id: Id979b1939298c6451b79af6a331736038a5c317f
Change-Id: If2a959a037c1c67f48a6f9e56e49c435050b0aab Partially-implements: bp solum-support