Bug: 135956699 Test: Build Change-Id: I247bfb3d877334fe822332275e37f015e10a566e (cherry picked from commit 4fea79cc) Merged-in: I247bfb3d877334fe822332275e37f015e10a566e