Merge changes I9df4d6fa,I841123de
am: 97e228e903

Change-Id: I923d6f507cfba689bc714ce2b8a26aa5ba13a4f9