Merge 6a78218ff6d17b63316af652d80098a9ec7f6608 on remote branch

Change-Id: I4913b956a043aec30099f0b04e8eee66a45e9fbd