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

Change-Id: Ia9c306437880dfc522cd506d24ca0677f9896c6d