Merge remote-tracking branch 'toybox/master' into HEAD am: 991623dec1 am: 7d37c6e2ff am: 079cc30a4c
am: ba014abc42

Change-Id: Ide0b45936cce25f135230aabddeea43811e7d724