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

Change-Id: I277e04c188c061551d913dba5d3ae8bb5a7e04be