fork frameworks/base
Merge commit '97a66f' into jb-mr1

Conflicts:
	VTSV.xml