Tracking a framework change; this is descoped from the next release forthcoming from this branch. Change-Id: Ib0519cd0ee60ff0051185e60d38be2ac299f420b
Tracking a framework change; this is descoped from the next release forthcoming from this branch. Change-Id: Ib0519cd0ee60ff0051185e60d38be2ac299f420b