Merge "[automerger skipped] Merge "DO NOT MERGE: CDD(8.1) Annotations" into pie-cts-dev am: 90b62d9442 -s ours am: 37c69e5e56 -s ours am: 6521c31281 -s ours
am: 308b84d92c -s ours
am skip reason: subject contains skip directive

Change-Id: I77b26810f2f364bf5cdf45baba3f245533e378c3