Merge remote-tracking branch 'toybox/master' into HEAD am: d716ba6533
am: 5e4ff06a52

Change-Id: I6c220beaddb8f50bf192d9cbd6eb5ac962b03a9f