Merge remote-tracking branch 'toybox/master' into HEAD am: f353b240a5 am: 66859184e5 am: 86fb74fe51
am: 4c410595c0

Change-Id: I4d0aba03bd3e6895976cf6864b5c8c8e39843bb5