am 908fadb8: am 661b4f78: Cumulative patch from commit a313d17de943cbaf12cbf67d666af14791be8ad2

* commit '908fadb800849bb9b0c578d4aca135ce9046f5ca':
  Cumulative patch from commit a313d17de943cbaf12cbf67d666af14791be8ad2