Merge f79727b157b67a7f4c7f2040750476663aa3395b on remote branch

Change-Id: Id711eaa293df658baafa7611c565806e324d2dd5