Merge changes I1042e87f,I58b17ecf am: 5d3357b6f1 am: 29c453abe5
am: 7880a2129a

Change-Id: I93e1e7f584cc27081e13104fd207499f4dc00e7f