Fix bad merge of aosp/1098712
am: 283fcf17c3

Change-Id: Idaf02d810d35a66c5bbd1f5c05a9dbeb30376303