Merge changes I10561d93,I05d248a7 am: 87c39032ab
am: 8aeeaadfe5

Change-Id: I01ce2ac80b4598adfac5944eefd675bcaa0a6185