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 am: 2e1c1a0a34  -s ours am: 2155b015b0 am: cb52b046f5
am: 9f9b6bfc90

Change-Id: Icc96506fa2779bece61f5ac2f56738f640044621