Merge changes I62be2c1e,I292662fc
am: e92461d802

Change-Id: Ic18f80aeddb9ec97fe6383196c3693ced64da45c