Merge changes I3506c8e7,I198c0e8c,I8a5d4e36 am: 6bd04c1570
am: 492ae86814

Change-Id: I04f5defda4427c5ba1518bd1b196e5b9e2f1ce59