Merge remote-tracking branch \'toybox/master\' into HEAD
am: 06b90e3d57

Change-Id: Ie78a98ea6c99a1262dad73eb6795d8c6c20ae9f5