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

Change-Id: If5cb854b6027d42c7b05b8adc341479f04dce310