Merge "[Settings] Avoid from crash" into rvc-dev am: 7ff5f56ea6 am: e96b23a251 am: d737972b80 am: 49b6457633 am: 56fae18451
Change-Id: I5313f05bc7c8dc6afb2b4ae1b1084ed6c182e615
This commit is contained in: