framework base patch

Change-Id: Ia85cf50b977b0d6f412dde2be4caa2aeab471532