Merge a6b7c0e06a3d545e6ee9c0c7050ecac2ef9c8aab on remote branch

Change-Id: Ibde2a1a5e376d976386fc334a9d551a892b951b4