Merge remote-tracking branch 'toybox/master' into HEAD am: 87edec9482 am: 4da5712e56 am: e08da3253c
am: 4dbe345131

Change-Id: I2b04f22f369b29fd7b897480f8ac4908a033c29c