Merge d7e51b111e49811712df651dd05eced9bad90df1 on remote branch

Change-Id: Ic925c911dbe2e88bc28593332c57bd5321db75ed