Merge \\\"Also add the monitor offset as a potential implicit NPE.\\\" am: 5be510d8 am: f227c63b am: 4dfdab6b Change-Id: Iac707745d171fa262bf5d7581a72cb2258ba20b1