[TEST][DO NOT SUBMIT] squashed changes from current branch to branch in http://vaniraosp.goo.im/#/c/3937/

Change-Id: I2c18fdd12524724bae1bb7669ec3b763e39e30b0