Merge 4a1fa855af7ac3e1e7eb148bef15d5f1356d1da0 on remote branch

Change-Id: I7354ddaa557bb395845cce790b91ba92c3ac5ea9