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

Change-Id: Iae75cb1bf56186a797f0e7a60e62d361c248866a