Merge bf461de4fec5a6220318ef3f80ef9af925f3b934 on remote branch

Change-Id: I55188a38a8ca93d7bd152119571ff8c462bfb802