Merge changes from topic "oth-b123003088" am: 9d94a8566f
am: 1b22ce2dfe

Change-Id: I52e644090a6c1dae3d774581b1b4fa2a076c5df8