Merge remote-tracking branch \\\'toybox/master\\\' into HEAD am: 0803f535c0 am: 092461d02d
am: 2ec6bb6932

Change-Id: I817ed223ef8ba3b11116bec735efc19bbfcfd6c8