Merge commit '4273721b1af8472a5aa4e22773715eb0b4c2e3a2' of sso://googleplex-android/platform/frameworks/proto_logging into HEAD
Change-Id: Ie2cd399fdf88bce58226f80c5d7769ee873c0149