Merge "CDD: Strengthen accessibility recommendations" into nyc-dev
am: a4fdf1667d

Change-Id: Ie3304176c834fb26306a52ed95d8ced31aaadb95