Merge "Enable BVRA client"
am: ae1624151b

Change-Id: Icdf3db658c79216f76b7a27018228578fc775385