Bug: 187444679 Test: atest ApexManagerTest Change-Id: I60482a180d873a5f65887d0a5bb4230f75cb55df Merged-In: I60482a180d873a5f65887d0a5bb4230f75cb55df (cherry picked from commit 2bcdaf91)