Merge 4a1d3f6e3db81ddfb2370851782efe74e13b2f8f on remote branch

Change-Id: I54ef51820b5512f94f472980bd7873a02707b0bf