Merge tag 'DPI' into cm-10.2

Change-Id: I11792d365f336cff06500ed0bba24dcbb4018d06