Test: manual; compiles
Bug: 140928181
Change-Id: I66e38efbf87bed573766a17cc1401ed19e606c48
(cherry picked from commit a2d980661c)
Merged-In: I66e38efbf87bed573766a17cc1401ed19e606c48
Test: manual; compiles
Bug: 140928181
Change-Id: I66e38efbf87bed573766a17cc1401ed19e606c48
(cherry picked from commit a2d980661c)
Merged-In: I66e38efbf87bed573766a17cc1401ed19e606c48