Bug#834753: Patch sent upstream

[Chirayu Desai]

Hi,

I have uploaded the patch to upstream's code review system [1]

[1]: https://android-review.googlesource.com/260250