Merge remote-tracking branch \\\'toybox/master\\\' into HEAD am: 5bb7e2581e am: 85abb28ade
am: 3a4d91e0b5

Change-Id: I80910a8cf1356e48771d3c62cd9eceb91e1804f3