Change-Id: I075cd72363ba0ea0e84bb57fe017fce20e051862 Test: atest DataManagerTest Bug: 180122164
a12b964839