merge in master-release history after reset to 74093917329681f7480a46366972b373004bd8ce
The Android Automerger [Thu, 22 May 2014 12:49:06 +0000 (05:49 -0700)]

Trivial merge