Merge changes I3cd68e65,I837596e4 am: 01b3b33248
am: 5f861fba96

Change-Id: I17c41cac4ff9aff789614217ca11c7a9c7d88b3b