Merge b74633720d6c30416b06a1b004964b43a6e54fe3 on remote branch

Change-Id: I37fd9a869ee364cbd1e5f4b262d84ca1f5ffc9c1