am 5685cb4f: am 7e841216: Merge "Fix build failure due to not override abstract method"

* commit '5685cb4ffbedfd7bceda8efa0493bb201ed8d066':