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

Change-Id: I601b62fd047d2b446de3d6c67c18bcc0a56316f9