Merge changes from topic "b/129002747"
am: dddf40a7f5

Change-Id: I80cb05e7ff96f91d037ea5bddf7c1c1ab44ca1af