Merge 7cc34529cd52b1522ed60497437851758312c066 on remote branch

Change-Id: I9a2ad72f0a94585cc7bdfb21e8eabed57b066357