Merge "Allow to enable WAL for testing" into oc-mr1-dev am: 14b86be8da
am: 48a272464c

Change-Id: I46e7494178f86e56faa214cca709fd360659cb73