resolved conflicts for merge of 3b0c40cf to master
Elliott Hughes [Mon, 28 Apr 2014 20:58:46 +0000 (13:58 -0700)]
Change-Id: I9e3b0735950cb1e495ecd58590b5d6e1f253bc88


Trivial merge