Merge goog/master@c8da37c into stage-aosp-master. am: 38365a1634
authorXin Li <delphij@google.com>
Thu, 16 Jun 2016 14:55:14 +0000 (14:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Jun 2016 14:55:14 +0000 (14:55 +0000)
am: e1fb5fe7df

Change-Id: I66862093415ec3e74c8852a42da34c6517c839fb


Trivial merge