This avoids stalled class references. Bug: 27398183 Bug: 23128949 Bug: 26846185 (cherry picked from commit 511e41b4) Change-Id: I5e33496859e65456d185cc09ca12736dd6414d77