Bug 506527 This is just to maintain compatibility with RMC. No effect on EPF behavior. Change-Id: I3a6bcb4119f310b5e1dd37da9f0cb7d96d631f4f