Merge changes Ied888249,Id8857c45 am: 549ea4801b
am: f38699f28c

Change-Id: I56180c0ff2c4daaad65776b7c41baf942cfe001a