Cumulative patch from commit f2d6c17aa0f9107a0e8092238b849461447cdd21
am: 31a29cc7ed

* commit '31a29cc7ed87b62465c7e01f03484f4643d12309':
  Cumulative patch from commit f2d6c17aa0f9107a0e8092238b849461447cdd21