Merge "Add default values for pm.dexopt.core-app." into nyc-dev am: da147a7c20
am: a5c29e31d4

* commit 'a5c29e31d4cf8a80320e2cb0513bd4941f62eec7':

Change-Id: I76e3221877c1108fc4f2a3dc38de57d22f06a9a0