Merge changes I36396394,I00aa37f5,Ibc14b003
am: 9c4feaa082

Change-Id: I459a34b7e0ce4a4153da2e92640f3dc4231d32d8