am 03658834: Cumulative patch from commit 4aa9c156e583c64cf5d90751ec888c478e1155c2

* commit '03658834c33748b9ad86f3d4cdf0c7be9c6887d1':
  Cumulative patch from commit 4aa9c156e583c64cf5d90751ec888c478e1155c2