am bc411cdd: Merge 520c90cc from master. do not merge.

* commit 'bc411cdd0233914f5fbab34e8e43fd98732f416b':
  Merge 520c90cc from master. do not merge.