Bug: 29232136 Change-Id: Ie57d0228eb42246c4ac1d7a01e2782a621b7e78f (cherry picked from commit b070577d)