Merge 3bae0eca5b4c2f2ff6d82e7a9d1e89d20ea231b7 on remote branch

Change-Id: If0eb5eb0537b87c41934111f22a6c56051bb5f65