Merge changes If63492b7,I9af57e3e
am: 25c76de0c8

Change-Id: Ia0e10a531c57150caeda6dcbbad4cc09214f4959