Merge changes I53dd3b2a,I019f1811
am: 9041c606de

Change-Id: I2476f6f9507adc27c23dc5903e7dc297f5eb79a4