In preperation for Note2

Change-Id: Ic606b2b44a6e3ffdb02633a22b983172f057e1e9