Merge remote-tracking branch 'toybox/master' into HEAD am: 4be718d62e
am: c3095b883f

Change-Id: I939c7a1c7a43ad5b692ab084ee5a55a702e2540a