Merge "EVS patches from AOSP" into pi-dev
am: 98563bff3e

Change-Id: Iafa0f550f34fdb4e436597f04e552ff53ae9fb57