Merge changes from topic "b/64114943"
am: 98caf20a65

Change-Id: I7629aa02a6e2562b6ec1af6b1f76e6ef0118029a