Android O MR1 IOT Release 1.0.2 (4862549)
Merge "Comment out conditionally used variable."