Merge EV "jellybean" into local jellybean branch

Change-Id: I862beb711ebaf44beaa4d04541ba809e666f757c