Merge goog/master@c8da37c into stage-aosp-master.
authorMika Isojrvi <misojarvi@google.com>
Thu, 16 Jun 2016 14:51:32 +0000 (14:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Jun 2016 14:51:32 +0000 (14:51 +0000)
am: 38365a1634

Change-Id: I12f5f85447894cbefcccb3c38737856e6e5afb96


Trivial merge