Merge "Fix issue #110010842: 875481 hi - Android - [Source] Context..."