data workaround test
Merge branch 'lpx13d' of https://github.com/Android-L-Porting-Team/Mako-L-Rebase into lpx13d