Merge bc29b16762cc505b0da0054e5e75bf36464841c1 on remote branch

Change-Id: I92f62fee7be86a5880fcb9e84a635a55753eabc2