These appear to have been missed from earlier effort

Brave attempt by: Curtis Hamilton

(cherry picked from commit abb9cd92)

Change-Id: Ia778e090c46220d83388ea1a9485b9009787f191