Merge "Workaround discarding of @Retention(SOURCE) annotations" into oc-mr1-dev am: aa9f5d12cd
am: c666fc2434

Change-Id: I75713ebdfce0a8a16b457c5354dc846254f63a41