Merge "DO NOT MERGE: Sparse resources fixes am: ae793c389b -s ours am: ce25f76fbb...
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Fri, 9 Feb 2018 19:23:02 +0000 (19:23 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 9 Feb 2018 19:23:02 +0000 (19:23 +0000)

Trivial merge