Same as for VFS. Change-Id: I0f09d43f24c32361af5e5658923140c79244d3d1
Change-Id: Ic716f336b7071063997cf5b4dae6d50e0b4631e9