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

Change-Id: Ib61b38a3fd065c3906e2e3f0863b83f2f4b740f4