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

Change-Id: I6bfd8dc565cb4b835f65c3e144848bd6099272c7