[automerger skipped] Merge "Documentation for enum PersoSubstate" am:...
[automerger skipped] Merge "Documentation for enum PersoSubstate" am: 3e3e78bf am: f48c56eb -s ours am: 570a6117 -s ours
am skip reason: Change-Id I011c4e67b4189e5db21883f3ac19bee5ea2af250 with SHA-1 20c63696 is in history
Change-Id: I447c0f7753254f06711892824acf4ba9ba201ec9