Promotion of bt.lnx.2.1-00015.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1068380   I52795152c745536978105decdc08018ea80f2dfa   MAP: Fix following for MAP Email GETMessage:
1068783   I6d1b85a4f63fee9a2a6ce2e9c4bc77346114537c   OPP: Calculate file size if not provided.

Change-Id: I6ef2ddc1bae8fc34f6241b5eac736c87075a7fe8
CRs-Fixed: 1068380, 1068783