Framework Base sync part 2

Change-Id: I35681aa5493f32f9b18565a8581face9270d4195