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

Change-Id: I4776d3dc8423501fea804eccb30713e721a3a7e5


Trivial merge