Android 5.1.1 release 28
resolved conflicts for merge of f82f5e01 to lmp-mr1-dev.

Change-Id: I093d7ecf48e9137b974047cd7d0fd2209792b748