Merge changes I9ad9b542,I2a4f4bb0
am: 58c78ab23c

Change-Id: I085f1a483319ee37942e8f11548855206cd44eea