Merge changes I3f6a5887,Icf91804d
am: 360c751fe5

Change-Id: I9e167dbf6710acd74e19af25148893070ed7a925