Merge changes If83c1cbe,I12ad2665 am: cdca05557d am: 3b815eee2a
am: b005b3ae2d

Change-Id: Ib9f77fbe6c43c4706cce89a6bcd99d9b840915e1