Merge changes I89610b96,I9986cd8c
am: e4dbaeffd7

Change-Id: Ic545c034d8fe32f0c669645c00d7c577d4a09f0e