Merge remote-tracking branch 'toybox/master' into HEAD am: bac04b4984
am: 3917661b78

Change-Id: I069acb5748db4d150cf9cd5fc51b3e209f4cd5d6