Merge remote-tracking branch 'toybox/master' into HEAD
am: c5a1dd459a

Change-Id: I4c5f54d1e302f5a783583249e111a3f64a6f39a5