Merge changes Iad51cd85,I6414d28c am: b90444bd10

Change-Id: I21c7fae78cf1bcc3233f7f07bda4b32e72645864