Merge changes If83c1cbe,I12ad2665
am: cdca05557d

Change-Id: Ifc3dbe11f88ceb83d77f0334894f739bbc64e1c9