Merge faf0bfff91f7bdcfc13ad52ddd57e267c5f1ad7a on remote branch

Change-Id: Iba64caedd1094268aa48ced5abfb802ac2ba616e