Merge "Remove reference to deprecated option." am: 3d238a895c

Change-Id: Ic0afc4e392a15b4c00b785848768e3fa37aabf45