Test: m -j checkbuild Change-Id: I71a98757ca8b79ace18708e12a451c05a7d837bb Merged-In: I71a98757ca8b79ace18708e12a451c05a7d837bb (cherry picked from commit be4fbce9)