Merge changes I5d39fb85,I87636ca1,Ic0c585fa,I39b5d4e6
am: f094ca06f4

Change-Id: I6cae0787f5f8986966d684a13420823af00cefbf