Merge b13ce1b60735ef7f892822788119f124a4ff4c1a on remote branch

Change-Id: I3dc841c509414bb18641fbeaddeb71a38fdec37b