Merge 5149f1844543625f789fd7619fa2e2de154e2836 on remote branch

Change-Id: I7b83de2ae456f4557e1966332322af3deeecf984