Merge changes I6dc353a2,I7df990f0
am: bb612a356a

Change-Id: Ibbf0934024884e8c24d6592e9963f549ef90a032