am: 2dcab783 * commit '2dcab783': Remove the no-longer-needed F/I and D/J alias. Change-Id: Ie99ef30801dcdd19aa5996dd3d9edbfd6e544453