Bug: 37351903 Change-Id: I6fed08c35474b10987388070eafb7b16e6944638 (cherry picked from commit 15eb998e65)
15eb998e65