Merge 2697f045ab322edf8d476b426ed2a8d9d3c3e7fb on remote branch

Change-Id: Ic52f02a7dc2a9a223727a2f042b5f1118c39c53d