Fix format device

Change-Id: Icef35175682c11a406ef85accc6c6e1acbf89f4d
Merge "Fix format device"