Merge remote-tracking branch 'toybox/master' into HEAD am: 73fd808900 am: e8c1b78ce7
am: fd457e1256

Change-Id: I447dac2eea7c07ab494a3e2c22748b14abf16501