Cumulative patch from commit c06c9099f0d0827feae5622097bd8ac946eca5ea
am: b97e428f8a

* commit 'b97e428f8acf1ecb93f38f8d0063d2f2fd0bc36e':
  Cumulative patch from commit c06c9099f0d0827feae5622097bd8ac946eca5ea