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

Change-Id: I33a60f9c113314c678ad5dc84bace199de8d3ded