Merge "Fix more issues in ojluni annotations." am: d411f2b2c4 am: abb68ebfa2 am: db6e3ac940 am: 9f3c97a365
am: 9292175ad5

Change-Id: Ia6925727c98d81b83280cfa45a92075efcff6fc1