Android 5.1.1 release 17
Merge "resolved conflicts for merge of 11b83982 to lmp-mr1-wfc-dev" into lmp-mr1-wfc-dev