Merge 2015afe45055d4e4adbb33a27c3688f7c8720d3e on remote branch

Change-Id: I540f1ebd1df3a5ecd6891e74c358116ec2c7fe2b