Changes started per LT-9395 and edits

Change-Id: I5c081a8d48162e2da4a1547a44778b7cf04cb701