Merge "resolve merge conflicts of cfeb3c0 to nyc-dev am: 518f489214 am: 5e80b7e463...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 6 May 2016 19:17:51 +0000 (19:17 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 6 May 2016 19:17:51 +0000 (19:17 +0000)

Trivial merge