Merge remote-tracking branch 'toybox/master' into HEAD am: fa58895b44 am: e77b0564e2
am: 579a5da1af

Change-Id: I36aa5ec1bc25a6aed0fad2a071e538afe5a71512