Merge "Fix testFullDisk is failed in TV device" am: 72caf2a9e2
am: 2fc2e1586a

Change-Id: I249d8da5f8a09b85af779fedce4d8f81638cf294