(cherry picked from commit e5768fcc) Updated for API 20 Bug: 15081617 Change-Id: Ia9425600764f581cdc1977b54f2e774dbabdadd0