Merge \"Also add the monitor offset as a potential implicit NPE.\"
am: 5be510d8fe

Change-Id: Ifa99606f7010d88931bc670482816d517dc035a2