Merge commit '83aa36d' into import

Merged in version 2.5 and add in misc files.

Bug: 122778810
Test: None
Change-Id: I9c999773d30f4114ab1ce8aa44b27f3aa4ded80c