Bug: 130763340 Test: Builds. Change-Id: Ieed72d4e15c0ce0dfc3a4f3383ea6563905bc236 Merged-In: Ieed72d4e15c0ce0dfc3a4f3383ea6563905bc236 (cherry picked from commit 8269f3a3)