Merge commit '1ed55eb5f724f82e797dd454a440fa047ea51f4f' of sso://googleplex-android/platform/hardware/ril into HEAD
Change-Id: I148ef8dc271e95abb803d3dc735a24d3bf16b219