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

Change-Id: Id8298b77e4d0c3402499dbfc079c7f228cab4034