am 2e23484e: am 990c224f: Merge "Un-deprecate getDhcpInfo" into klp-dev am: 51ff2b0d9e

Original change: undetermined

Change-Id: Ia36d6e2f77b3045e8ddc4121c314937c6f2fdcad