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

Change-Id: I77948d7694e6dc08c6ae09b577a98fd06142c908