Merge changes from topic "b/140916230" am: 59942d7e52
am: e0cd965e7b

Change-Id: I6f4db683c0d1d08200080027d66f4ade31e2c6b1