To be used in a follow up.. Test: treehugger Bug: 151965589 Change-Id: I1a285d0eb827eed33d9dcca2ec6e2be2ef098185