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

Change-Id: I0fcd0f703b30b12cc2f4c0e5afd3d9c43f3ff0e9