Merge remote-tracking branch 'toybox/master' into HEAD am: 87edec9482 am: 4da5712e56
am: e08da3253c

Change-Id: Ibfef7570d2b6dff62a682e34d8134d55f39896ce