Merge 1a8a575cf16634181cb7f72ca1fdbdd9b4d04c18 on remote branch

Change-Id: Id89ac892d63e9506e1c1da419ffc9d85b148c358