Merge d88800612b8376bdde800537c52f4e01473a4b33 on remote branch

Change-Id: I70ffd2232efe0c67f78397dc64b3cd9bb58dbb6f