Cumulative patch from commit 077dcfb8c48d2509a6e116c0de3ad57d2fbfe4fe
am: 57c2d39d85

* commit '57c2d39d85825f38c5fdac9b73bb0088406ffc85':
  Cumulative patch from commit 077dcfb8c48d2509a6e116c0de3ad57d2fbfe4fe