Fixup for merge PPR1.180522.001

Change-Id: Ia19fd0c742f5b07dec46d7fedaaeca1a10425a90
2 files changed