Cumulative patch from commit 3560b32ca34f0ac20e4883cd2a0ad21a20502dfc am: 1702232 am: 4db0c89 am: 3ce2205258
am: b987170762

Change-Id: I00cfa91cae8eb5b4827d4881a4d9721b556c8c05