Merge remote-tracking branch 'toybox/master' into HEAD
am: 73fd808900

Change-Id: I32af02ae6ff58b9aa9160f7a58dad6b30c2e5c44