lets use my branch as stable framework/base

Change-Id: Icb4645e69669fdb100993b8c87653c9656e07a9c