Merge "Fix compiler crash due to inline caches and improve docs" am: a559fa1b0d
am: ceece21554

Change-Id: Idb7ecd7725d330d972adbae855dffbfdeaa97813