Merge changes Ic48ccda9,Ibc0a29c9 am: 5504aef8c1
am: 722a1c9dda

Change-Id: Ic74c991e0fcf6b2b1869c1b35e4b5b9a43cabc18