Merge changes I836a2523,I2826f710 am: 4d9df86da3
am: 338554372a

Change-Id: Iac95e6a02d2da7106043b3bacdf37dcdf7e1a65d