Merge changes I7a3c181a,I72c60ec8 am: 6aa1b01316 am: 03784e1aa5
am: de3e798cc8

Change-Id: I0b6bba7e4e889bb38bdffe6c0fefab81de30f4c8