Merge changes If7fa11e7,I345c9a5d am: a5a6c0a0bc am: 7163fb158c

Change-Id: Ic4801436f6e2466e267371256cef14b9b638eeae