Merge changes from topic '36810152' am: b7826a74f2 am: a14353e664
am: b174f19f24

Change-Id: Ice073716a1a7b0cbbce9d423148ee314d003548e