Merge remote-tracking branch 'toybox/master' into HEAD am: cb633d4175 am: cf77ae240a
am: 0f36350092

Change-Id: I1c61311d2d3cb50b73c6cfbd57a2049f18784b86