Merge "Cumulative patch from commit ed0a4ddc22526361a138c6b145561fcaac24e2a5" am: 21c780dfa7 am: 31e3aab1fd am: ca30bea46b
am: d890b54af9

Change-Id: I80984e5f0d606a5ee1338d0afe4eb42b29ef2a40