Merge remote-tracking branch 'toybox/master' into HEAD am: 0fcfdec760 am: cfc9d622f1
am: 9e1692d379

Change-Id: I5d0c9c2aa6ee1da2140998b23229fc3186fb38f4