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

Change-Id: I551128e8ef955257b77db0f04e35e0829228f009