Merge "DO NOT MERGE personal indicators are dead. long live personal indicators." into jb-mr2-dev