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

Change-Id: I6333eed7da2625a07f24a687a4c1adaee1b4ce70