Merge changes from topic 'sms-files-move-opt-to-base' am: abcc43d86a
am: d38615b846

Change-Id: Ib24d0d0f98ca59684e64ea9a85dd230d17143cb8