Merge "Adds restore/setup specific dex flag" into rvc-dev am: 299a2511 am: 3f986577 am: 473d9127 Change-Id: I526ab7eeaa397a351f80016744da75bea1e9893d