Merge b79f371b700156dfa5763d19eaf5a373eafd7d69 on remote branch

Change-Id: Ic4aac94979ac2dd58cab069a3a75941b7c619bd5