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