Merge commit \'f8bc27d9683e4089cdfd778dcb61ae67f44665b7\' into manual_merge_f8bc27d
am: 49bcc5dd80

Change-Id: Iee2a7015eefd6a75be2968ec855334f68ec5f79e