Merge 26188a68462085aa2306a8e303f0d5f6ff5722c9 on remote branch

Change-Id: I87ac29fab64c2b3207c9dd3386d2c0103e15a386