Merge "Add DumpstateOptions java implementation" am: 52502ef1a1 am: 8a9f23c8a1
am: 1d1184cf83

Change-Id: I556407ee455b92e3bae34dfa603e159b99f45080