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

Change-Id: I248376888406a9beef0266bbc19a16c34c12a934