Merge changes I193805ef,I2e1b9ac5 am: 1ea70d24d5

Change-Id: I237ff4ef41d3dfb3fd74f74e0c252898d19962e5