am c73f3d5c: am 7b879999: Merge "Fix issue #7238170: Edit picture option is...
am c73f3d5c: am 7b879999: Merge "Fix issue #7238170: Edit picture option is not available for the secondary user." into jb-mr1-dev
* commit 'c73f3d5c':
Fix issue #7238170: Edit picture option is not available for the secondary user.