Merge "Merge "Merge "Merge "Add missing file" into kitkat-cts-dev am: 092f65bb1e" into lollipop-cts-dev am: 0b33da6eb7" into lollipop-mr1-cts-dev am: 12a52aa1da am: f3139a5635" into nougat-cts-dev