Merge e53030bca0a94d5fad563aee9cff06ff4880bcd5 on remote branch

Change-Id: I5908661f94d4df37d17bc4683101beb1243a6ca0