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

Change-Id: Id01d68e913692debe2aa1d9f501e0bb90401bec0