Merge cc551cec2df031b1fa4c55cf0913b54b4f293ed2 on remote branch

Change-Id: I21159cdda39c13d19f5fd98912cd2e4762fba1e0