Merge commit 'd29f004fcdb7cc9ec8c0bd5247c5f03c19c424f8' into HEAD

Change-Id: I5e9a2fc6bdb9718be6da993366dae88b1c6f42fe