Merged with current master branch.

Change-Id: I0b291ad1ddccd74c107edc24bebad008a063e9a0
Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com>
Reviewed-by: Bojan Petrovic <bojan85@gmail.com>