This is in preparation for the implementation CL Bug: 17716971 Change-Id: I3042b0781f48f3d9e84bfff899507b4b5ca156eb