Merge b11e77ad2eb4bcc91543d1b1e11071d000eadd5b on remote branch

Change-Id: I49e7f897fdfb9c19b39d9ab122d3e8ba9dd3c83f