570470a332
Also add "none" flag value for null displayOptions in xml Change-Id: Ided3433638f02ba2a18ce08db265d7a8ac4f216c