Merge "Fix KeyValueBackupTaskTest shadow errors" into qt-dev am: e6763f287b
am: 13d6dcaf0a

Change-Id: I6e9728a48316b21ca00ac1dffbc0a7c0cb119ef0