Update new and deprecated options (except swift)

Change-Id: I47f60f9c94aad3e3df2fe8c213b10b5312a19d3c
Merge "Update new and deprecated options (except swift)"