Merge 2b6adf6b96ced8cc40f26a4b1face91238f265d0 on remote branch

Change-Id: Ib8e618d39985451aafa35324795b3abe25ddec25