Bug: 62376042 Test: unit tests + inegrated (sl4a) tests Change-Id: Ib6383a0ba9ef61114eb72b9a04cc683792b8e89d