Merge "Persist metric activation across beta4/5 ota" into qt-dev
am: 12ae95987b

Change-Id: I614602e2a4facb0ccdf40ab8599f875750ce0679