Merge changes Ied888249,Id8857c45
am: 549ea4801b

Change-Id: I6c6823bfe0d2a14d7ef7371d331a6bd672c6c7ff