Merge b4fa49406fa1e36a3d4ce3daaf266d06cd7fccf5 on remote branch

Change-Id: If74de99f00456c4abad0321c3fcabbf546eee84b