Merge "build fix for aosp-idea133 @ 1119318"