Merge 491e8b59e7c7b541fe7df49b262c5180bd41d57c on remote branch

Change-Id: I8ef7b2890b785f36e77d28a4b9fa7828373ec8ba