Bug: 18027433 (cherry picked from commit 59a719c466) Change-Id: I32bcf3ae0d4569d4d8b88168e6c36ddff70b8f7d
59a719c466