Merge changes from topic "libedify-header" am: abade5af15
am: 28e8a2c43a

Change-Id: I0492beacef5c544beb2e3fa0ce0fe25070a0348a