Merge de0506d13ad1963d81cdf60808b212df2bb0a98a on remote branch

Change-Id: I22ceffce56076a1890a2e1e6e233a58f94b37952