Merge changes Iec53a9fd,Iac4cfe70 am: 29afcf0eb0
am: b0c74fb227

Change-Id: I56af4e9a82f66e507d2360822af27a39e0fcb238