Merge changes I4eeed196,I80f9bc4e am: 1244b48fd6 am: 96d9aa140b
am: 0264abe5a6

Change-Id: Ia05e694583690d223816d3bf33ceffb52a1fdb4a