Merge changes from topic "b/67046543" am: 2e1e7bd962
am: 22f7401cd7

Change-Id: I06a72562cad1340fceef095b4bdf4d4472b84d4c