Merge cb8b53f9145976a173ee6c8cc1d47ecc420c2292 on remote branch

Change-Id: I427417cec2070da9ef0c36fcf89d49461ac82e4c