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 am: 1fe1d98ddb  -s ours am: 4750e87db9 am: 5b789a18bb am: 37032e3978 am: 941716920d
am: 0a2f5b929c  -s ours

Change-Id: Ibb7d7a55107f0c8b61992ce1f450cd67c25b6ec8