DO NOT MERGE Make classes open for inherit Bug: 260534051 Test: manual Change-Id: I57b05f12430e5e57816539f9a14c46243187c150