Merge remote-tracking branch 'toybox/master' into HEAD
am: 64279d4042

Change-Id: I48207b36bf2d3b3285791da11750488217eeae89