DO NOT MERGE Cherry-pick:Update Gallery due to API change.

Change-Id: Iebb5c774a05581ba3c3b29d695ee7d5fa37576b8
1 file changed