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

Change-Id: I711a67c8c9abf696412514670a0e57f3d4c10b83