Merge "DO NOT MERGE Fix issue with annotations test plan generation" into klp-dev am: ab0bad3507
am: 886889fc2b  -s ours

Change-Id: I00bb3ce0b955fae7a88fcdf8a7f0997421f888c3