set internal storage as primary

Change-Id: Ia22aefb5c89dee7b1f2194c935d63d7b27ae3f03
(cherry picked from commit fdbbe1fa89bf7590796acc49bfe62994af9a76c6)
Merge "set internal storage as primary" into jb-mr2