am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1.

* commit 'aa4b1d8ba9d5e317b67638b764d92d17fb810aa0':
  Merge 36a3a392 from mr1.