Bug: 130816005 Test: build and run Change-Id: Ibb0af40165c6b330785ef208510ba654c5ee6ad7 (cherry picked from commit 136870f7)