tree ffb8e61453e860b1cd0004693d1d61958fc1c705
parent e07c947ea35b07eb354dd43068a5670dd6cce2ef
parent bdc60742764d02ed095a534728951e93885f2444
author Kenny Root <kroot@google.com> 1453433435 -0800
committer Kenny Root <kroot@google.com> 1453433435 -0800

resolve merge conflicts of bdc6074276 to master.

Change-Id: Ieea1b33867acc7a6dd17f0340f30a66c29ce4359