Merge "Import fixes from an internal repo." into lmp-dev
authorJarkko Pöyry <jpoyry@google.com>
Mon, 29 Sep 2014 15:36:06 +0000 (15:36 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 29 Sep 2014 15:36:07 +0000 (15:36 +0000)

Trivial merge