Merge remote-tracking branch 'toybox/master' into HEAD am: a0637cef8f am: e9452d6abe
am: 5788fc59e6

Change-Id: I82583191a17b4dc8e49c9c29d4da2c0fdaa7f86e