Merge b6db9afbc67dc6df8fa7348613dd3c9b726a67d0 on remote branch

Change-Id: I88b9717eacc14c4a3ce9e37e654db0c59512b5aa