Sync with AOSP to make http://r.android.com/326568 merge-able.

Bug: b/34054813
Test: it builds
Change-Id: Ia2ac85c9fa6822436823d1b7ec2c276d672e3cec
1 file changed