Open and Close works
Merge remote-tracking branch 'android/master' into storage