This reverts commit 2d906b41. Reason for revert: Semantic conflict introduced build break... Change-Id: I3dbd11a8f73ab2636a732693639edcf869be8033