Merge 6e60f471350fdea256c4caa1f10a7a197e9e48bb on remote branch

Change-Id: Ib04c71a471e29459c36ad81e76ac04f17b7d791a