(cherry picked from commit c3f73f78) Bug: 21555893 Change-Id: I92e11637cc1f8f694e4d4138512cbcf47e22a249