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

Change-Id: I429e855c09e75bea305fc94048f8e4c7b772b0a1