Merge cherrypicks of [2647875, 2648067] into oc-release

Change-Id: I21c55ad8fe10d90fab0ab8d26ea11e1d927dabba
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 2c78166..416542c 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -49,8 +49,8 @@
 TARGET_RECOVERY_PIXEL_FORMAT := BGRA_8888
 
 PRESENT_TIME_OFFSET_FROM_VSYNC_NS := 0
-VSYNC_EVENT_PHASE_OFFSET_NS := 1000000
-SF_VSYNC_EVENT_PHASE_OFFSET_NS := 1000000
+VSYNC_EVENT_PHASE_OFFSET_NS := 7500000
+SF_VSYNC_EVENT_PHASE_OFFSET_NS := 5000000
 TARGET_USES_HWC2 := true
 
 TARGET_USERIMAGES_USE_EXT4 := true