Cumulative patch from commit 3560b32ca34f0ac20e4883cd2a0ad21a20502dfc am: 1702232
am: 4db0c89

* commit '4db0c89c0e6c44ed1b58e93c92465fdf60fc5de8':
  Cumulative patch from commit 3560b32ca34f0ac20e4883cd2a0ad21a20502dfc

Change-Id: Ic70fcf385bec579b82f5392a2f727b7bcca25b41