Merge 77bceb0beb3de931bc3296db2a9104cc8d75c50f on remote branch

Change-Id: Ie71cecbfc01e502a9972ce42123288314a57cfb7