Will inherit additional functionality and cache improvements Bug: 17760225 Change-Id: Iab1816d37cc74343d83629d851a5784d4865ebb4