Bug: 15141726 Change-Id: I6caef98cdd49e85a65c033708180231a948ac352 (cherry picked from commit f2f9daf9)