tree ac657c9488198ecfab1d793379f68cc8a590c859
parent 1353c06d835ec52030543df25a2c745a2777e0a3
parent aac7d0442ce3b6b6301b93d0bc2c0f0dca67d5e2
author Christopher Tate <ctate@google.com> 1470851090 +0000
committer android-build-merger <android-build-merger@google.com> 1470851090 +0000

DO NOT MERGE: Backport N backup/restore stability work to M am: d6f3a11107
am: aac7d0442c

Change-Id: Ida93e1782221df18b2e7abcaa9da319e5ed28325