Merge remote-tracking branch 'toybox/master' into HEAD
am: 62f36d9160

Change-Id: If03981a937fed75efa974b00c8cf5ed0fcc5fbce