Merge "Update mustpass"
authorHengyuan Hu <hengyuan@google.com>
Tue, 7 Jul 2015 22:40:22 +0000 (22:40 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 7 Jul 2015 22:40:23 +0000 (22:40 +0000)

Trivial merge