Reconcilie to Cyano cm-10.2

Change-Id: Idc2f3e15fb4493c128fd75a545e98054fc8c3e7c