Merge b735c88b614adf444c8d7707bb7cf877b5df8882 on remote branch

Change-Id: I868090f743e5b0c5218f508b591b469d9db0fea5