Merge changes from topic "libdrmframework" am: 84a53822a1 am: 460618a6d1 am: c317c587d5
am: e25539a93f

Change-Id: Ib8636ca3d1a5e251de8a4ce3643f0f88dfe85234