Bug: 12798969 (cherry picked from commit 7a60db234a) Change-Id: I3f72b5ce6c17ffa73f15c237d6bfbda85cdd9239
7a60db234a