Merge 86be675db34aa35db4412edc3240e1cc9ac928f0 on remote branch

Change-Id: I627540099e03641dcb95b58ddf1713c50704249d