Merge "DO NOT MERGE Fix issue with annotations test plan generation" into klp-dev am: ab0bad3507 am: 886889fc2b  -s ours am: 21dd07dbee  -s ours am: 20ef48b188  -s ours
am: 39357ca015

Change-Id: I04f8c6960fb6bab0abbbda6d4a7fdc3d05750e39