added for sign in bug
Merge branch 'LNX07M' of https://github.com/Android-L-Porting-Team/Mako-L-Rebase into LNX07M