Needed to restore the refs. (cherry picked from commit 9346ff0c) Bug: 21907554 Change-Id: I562906dff07dcaa78dfb39646ba9ab35a5f56c6c