Merge remote-tracking branch 'toybox/master' into HEAD am: cae4495189 am: 49859ac043 am: 4b45943877
am: d00e112a33

Change-Id: I7e1df8194b7fedf65591a167153cde26880becd8