merge jellybean-legacy

Change-Id: Icbb2d65c896a4543d72647eb6ab9ad855f35b7e5