Bug:21274132 Change-Id: I751319e82deca1e40a3926fd210dd71a55a785f7 (cherry picked from commit 5fcff4ed)