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

Change-Id: I639643fd5fd4e5cfe08045cb58a782434e6d1315