Merge pull request #473 from peterwang2050/n12l-android #1077

Job	Run time
test (commit)	1m 22s
test-optional (check-external-links, manual)	45s
build	10m 35s
test (push)	1m 4s
test-optional (gitown, manual)	44s
deploy	1m 3s
	15m 33s

Provide feedback