Put all these back in...

Change-Id: If2168a57e0c77cf7fe85d66a6c6fd6a810d45035
(cherry picked from commit f2a3848bee3f3deeb9dde43de51737cbdde84018)