Merge remote-tracking branch 'toybox/master' into HEAD am: 62f36d9160 am: 75bf2dab05
am: 899676bf14

Change-Id: Ia83328c3d524bdd0ee0f0803eae76089a2aef701