am 3fa7b69d: am 3b2fe7eb: Merge "Bug 17782530: Annotations using retention policy source remain in .class" into lmp-dev

* commit '3fa7b69db654c0f754797c762eaf17c64d1abd43':