SergeyZhukovsky merged 1 commit into master from android_build_fix Mar 8, 2019