Change master to match tm-qpr-dev

Change-Id: I6701a574234eec9a953fb3741a5db32bf554563c
1 file changed