Cumulative patch from commit 3560b32ca34f0ac20e4883cd2a0ad21a20502dfc
am: 1702232

* commit '1702232ce2a725e2303e9a27fefe4d14fed69c2d':
  Cumulative patch from commit 3560b32ca34f0ac20e4883cd2a0ad21a20502dfc

Change-Id: I4896f87d42f249d0d814548ab3fc875d83f5f8bd