Merge "Import several fixes from main repo:" into lmp-dev
authorPyry Haulos <phaulos@google.com>
Thu, 25 Sep 2014 02:21:44 +0000 (02:21 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 25 Sep 2014 02:21:45 +0000 (02:21 +0000)

Trivial merge