(cherry-pick of commit 0d786340) Bug: 31678708 Test: integrated (sl4a) test Change-Id: I822c66619642f08d1d8f68cc8257185360da60be