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

Change-Id: If6b47f5752ad6217a8e7437710aa9d274a9791e2