Cumulative patch from commit c24f8e8e75b46f0b191cca788b6f4c10bed81861 (DO NOT MERGE)
am: 7d56b75791  -s ours

* commit '7d56b75791f317618c9c3ff08a4cfc36c91c9611':
  Cumulative patch from commit c24f8e8e75b46f0b191cca788b6f4c10bed81861 (DO NOT MERGE)