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

Change-Id: I42bba7f5351b214b45255d9e48c3c6802b306b14