Target SDK 23

Bug:23642167
Change-Id: I9f790baf1d9becebb2aeb49c234052a0b9eb2dba
(cherry picked from commit ffe1a1e0b9a5fc48b24f0c18d4723f21946cc3f1)
2 files changed