Merge changes I720a1feb,I9539b8cc,Ib79b777b am: 82001cf993
am: bf07d802ec

Change-Id: I66a58f6f54a4d423ad603a2b642e6510c29bc07a