am 56b7352f: am 2e425d69: Cumulative patch from commits: a7f5271 and 7465640

* commit '56b7352fcb4f201faf0618c9680b84b961c1651b':
  Cumulative patch from commits: a7f5271 and 7465640