2017103976

Android Code

Test @ cbbd66bc
Subproject commit cbbd66bc491796f3dd19184bfaec16d4aaeb6300