Merge \"Fix rendering of policy transparency activity.\" into nyc-dev
am: 98704bc495

Change-Id: I0b66044361c76629f20d2bb56ebb0779885a5781