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

Change-Id: I7aba849186bec09237c876060340e7973279444e