Merge changes Ia639dd01,I12cf8838
am: 583a1beac1

Change-Id: Ie9657459cbaf30bca399ac95a51fd4937387bc80