O-mr1 OPM1.170829.004 TAG Integration. Compilation issue fix

Change-Id: Iaff616d11a8439df521e6c15aeedda4134fd0d4d
2 files changed